t / t4135 / diff-with tab.diffon commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1--- post        image.txt.orig  2010-08-18 20:13:31.616002255 -0500
   2+++ post        image.txt       2010-08-18 20:13:31.616002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage